KDE Plasma 6.6 + KDE Frameworks 6.23.0#59074
KDE Plasma 6.6 + KDE Frameworks 6.23.0#59074mnabid wants to merge 135 commits intovoid-linux:masterfrom
Conversation
mnabid
force-pushed
the
plasma6
branch
2 times, most recently
from
a58b02c to
c4dd0a4
Compare
|
Doesn't work. This flag isn't mentioned anywhere outside of that particular file. |
I've been running DX locally for the past month or so and it works fine without any issues. Works as a drop in replacement. |
Should work like this without needing a patch (and ofc, host needs to be recompiled first too) diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index c7ae0f6c451..c12a8498933 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -3,7 +3,7 @@ pkgname=breeze-icons
version=6.23.0
revision=1
build_style=cmake
-build_helper=qemu
+configure_args="-DINSTALL_HOST_TOOLS=ON"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools python3-lxml libxml2"
makedepends="qt6-base-devel"
checkdepends="fdupes"
@@ -16,17 +16,12 @@ checksum=f12591f5714e053d8cef232ef41c36dc461516e4b89eeade77cc1947a33ddd33
nostrip=yes
if [ -z "$CROSS_BUILD" ]; then
- configure_args="-DBINARY_ICONS_RESOURCE=ON"
+ configure_args+=" -DBINARY_ICONS_RESOURCE=ON"
else
- configure_args="-DBINARY_ICONS_RESOURCE=OFF"
+ hostmakedepends+=" libbreeze-icons-devel"
+ configure_args+=" -DBINARY_ICONS_RESOURCE=OFF"
fi
-pre_configure() {
- vsed -i ${wrksrc}/icons/CMakeLists.txt \
- -e 's/\$<TARGET_FILE:\(generate-symbolic-dark\)>/\1/' \
- -e 's/\$<TARGET_FILE:\(qrcAlias\)>/\1/'
-}
-
libbreeze-icons_package() {
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -37,6 +32,9 @@ libbreeze-icons-devel_package() {
depends="libbreeze-icons>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
+ if [ -z "$CROSS_BUILD" ]; then
+ vmove usr/bin
+ fi
vmove usr/include
vmove usr/lib/cmake
vmove "usr/lib/*.so" |
Thanks, it does. |
3 participants
Testing the changes
Local build testing
x86_64-glibcarmv6l-musl(cross build)ISSUES TO FIX
breeze-icons: fails to crossbuildThis commit should've handled crossbuild correctly, I'm probably missing something. For now I just reverted it and went with the old behavior.
discover- crossbuild failed for 32 bit target from 64 bit host. This is due toqt6-webviewbeing broken.Tested for
armv6l-musl.kwin-effects-forceblurfails to build for KWin 6.6.I did not include it in this PR, but considering it's an archived project for half a year, I suggest it'd be removed, or replaced with an up-to-date fork like Better Blur DX.